; Spelling fixes

diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index b64ec223be7b327f63e5cd8a224ba9d2278fa43e..99b7bc1dc504d8904c5790ce10588932e6feb73d 100644 (file)
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1426,7 +1426,7 @@ Hostname of the remote server for remote mailboxes or file name of a
 local mailbox.
 
 @item port
-Optional port number, if not the default for that protocal.
+Optional port number, if not the default for that protocol.
 @end table
 
 @noindent

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 26b0915c0d9838cd1b3a25869be53a0f7a65f261..e1d84457ff99707d9d584e5f5acd5fc696d7b45e 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -405,8 +405,8 @@ September 2011.  Ad-hoc multi-hop methods (with a changed syntax)
 re-enabled in November 2011.  In November 2012, added Juergen
 Hoetzel's @file{tramp-adb.el}.
 
-XEmacs support has been stopped in January 2016.  Since March 2017,
-@value{tramp} syntax requires a method mandatorily.
+XEmacs support was stopped in January 2016.  Since March 2017,
+@value{tramp} syntax mandates a method.
 
 @c Installation chapter is necessary only in case of standalone
 @c installation.  Text taken from trampinst.texi.

diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index aa9cf167f75035db3a785b1f05037f5443254a50..bc4ed2232996a72e8a66586778875bf41f2b6f75 100644 (file)
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -507,7 +507,7 @@ _XMRecomputeGlobals(register Display *display, register XMenu *menu)
 
     /*
      * Ensure that the origin of the menu is placed so that
-     * None of the panes ore selections are off the screen.
+     * None of the panes or selections are off the screen.
      */
     screen = DefaultScreen(display);
     if (menu->x_pos + menu->width > DisplayWidth(display, screen))

diff --git a/src/xdisp.c b/src/xdisp.c
index 7ff37a6fb488f506f745894f4075c686fb1d57b8..826684949272f46f6857324a541af0abb19eb694 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4999,7 +4999,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
        {
          ptrdiff_t ovendpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 
-         /* Some borderly-sane Lisp might call us with the current
+         /* Some borderline-sane Lisp might call us with the current
             buffer narrowed so that overlay-end is outside the
             POINT_MIN..POINT_MAX region, which will then cause
             various assertion violations and crashes down the road,